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