Merge changes I90e72a20,I65e551dd into main am: d84a5b9d74

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

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