Merge changes I02e3046b,I5b33ca47 into main am: 50eaceedda

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

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