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