Merge changes I6e95870e,Ibcef6b73,I302ce3c2 into main am: 96b0065ebf

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

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