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