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