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