[resolved] Merge changes I08f5aa3e,I7876e44c,I4e90a045 into main am:...

[resolved] Merge changes I08f5aa3e,I7876e44c,I4e90a045 into main am: 0959d41b am: c8d75a80 am: ee3b9891 am: 67d45853 am: e5e23fda

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



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