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