Merge changes Iadce8bd7,I4ee818dd into main am: 92a97843c4 am: 3972968b45

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

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