Merge changes Ie7cf3774,Ia3cbaf04,Ide7496a8 into main am: 0f0aecc178

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2736161

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