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