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