Merge changes I524df983,I23578fd5 into main am: 7b45f035e2 am: cfe5b0220a

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

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