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