Merge changes I0586f761,I9fc71f9c,I0ad1f449 into main am: 85050a06e1 am: be00d31ac5

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

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