Merge changes from topic "b314861914" into main am: 761db93167

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

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