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