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