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