Merge changes I04c68e95,I9ab2b654,Ic0104961 into main am: c0857666b7

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

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