Merge changes I40241276,Ibbd47582 into main am: a2e6ce7bbf am: a15e9ac25f

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2990310

Change-Id: I1b2cc9afef6d0ea97a8b4ff208acb351cf2de2ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>