Merge changes I4d388590,Id15844d8,Iec4224d8 am: a028455e am: 60d19a63 am:...

Merge changes I4d388590,Id15844d8,Iec4224d8 am: a028455e am: 60d19a63 am: f0a4e386 am: fdadcd7e am: 496b1047

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



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