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