Merge changes Ie37e173e,I824f93a0,I0c385e82,I39cb4ad8 into main am: b35e61fd55

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

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