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