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