Merge changes I226ea90a,I56bb4a29,If4ac928c,Ice193294,Ibb107092 into main am: 006f16541f

Original change: https://android-review.googlesource.com/c/platform/development/+/2767858

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