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