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