Merge changes from topic "revert-2819069-LYZVLDOFQA" into main am: b73d41c50b

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

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