Merge changes I65474a11,I1e01653c into main am: 6cb5485214 am: 9d73afe295

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

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