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