Merge changes I3feede9f,I9194e2c6 into main am: 74295d4f am: 5efbf813 am:...

Merge changes I3feede9f,I9194e2c6 into main am: 74295d4f am: 5efbf813 am: e52a50ff am: a6c7a588 am: 2518bdc8

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



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