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