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