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