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