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