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