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