Merge changes from topic "am-160c9f8b5caf40a2a0b6fae94210de90" am: 437a607b27 am: ba89dafc3f

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

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