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