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