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