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