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