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