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