Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17955874 Change-Id: I1732afb2832902d6d4ed54b2934394f880bf1a22 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>