Merge changes from topic "am-08a155ca62144e49bad1deffa5127df4" am: dd79408db1 am: 8eac375466

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

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