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