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