Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17894623 Change-Id: Icb8b5769dfd77a528e3cffd92768595ecbdd699b Ignore-AOSP-First: this is an automerge Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>