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