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