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