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