Merge changes I41ebaf72,I638bc2d7 into main am: 900221fe33

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

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