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

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

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