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