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