Merge changes from topic "am-08a155ca62144e49bad1deffa5127df4" am: dd79408d am: 8eac3754 am: 2971e168

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



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