Merge changes Id338f439,Ic7f50453 into main am: 3468a90f47

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

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