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