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