Merge changes from topic "am-fc8f8533e81744278a6d9b7db27b7f19" am: 61c7de1e...

Merge changes from topic "am-fc8f8533e81744278a6d9b7db27b7f19" am: 61c7de1e am: 87c32dd2 am: 255db29a am: 51137c82

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



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