Merge changes If3a01ab8,Ib24d7c63 into main am: e2c6171f am: 30bf6a1d am: bdc1e1ed

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



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