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