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