Merge changes I7790dde8,I065907a5,Id2e82024 into main am: 532a608f58 am: 4570cf0ce2 am: 96430be4a3

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

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