Merge changes I343272f4,I5481893a into main am: 3d0d8e4b8f am: f9098ffba4

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

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