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

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

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