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