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