Merge changes from topic "am-558ef604bf3c4c1c8ddefc69ffec2c23" am: 411a160e am: 5bb2c9f8 am: f60b6fc1

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



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