Merge changes I343272f4,I5481893a into main am: 3d0d8e4b8f

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

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