Merge changes from topic "am-cc11d65e1ffe4630b407596190df86a1" am: d33cbfdc...

Merge changes from topic "am-cc11d65e1ffe4630b407596190df86a1" am: d33cbfdc am: 562daf46 am: b4fe62bd am: cc779ba1

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



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