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