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