Merge changes from topic "am-c7c1003483a74988b1bd48a340cd06ff" am: b09371140f am: 6e97bd823a

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

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