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