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