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