Merge changes I02e3046b,I5b33ca47 into main am: 50eaceedda am: f0e1d5105e

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

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