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