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