Merge changes I40241276,Ibbd47582 into main am: a2e6ce7bbf

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

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