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