Merge changes Iadce8bd7,I4ee818dd into main am: 92a97843c4

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

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