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