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