Merge changes from topic "am-fc8f8533e81744278a6d9b7db27b7f19" am: 61c7de1ea8 am: 87c32dd26c

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

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