Merge changes from topic "am-c7c1003483a74988b1bd48a340cd06ff" am: b0937114 am: 6e97bd82 am: a38fbb28 am: 65ef7ee9

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



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