Merge changes I6e2dcaef,Ie653d82b,I3d8e80b6 into main am: 2d340ba5bc

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

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