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