Merge changes Idb791187,Iad926450 into main am: dcf5858c66 am: ab808938a0

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3526294

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