Merge changes Idb791187,Iad926450 into main am: dcf5858c66

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

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