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