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

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

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