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