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