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