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