Merge changes I524df983,I23578fd5 into main am: 7b45f035e2

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

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