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