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