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