Merge changes Ie68aed2f,Ic40696b3 am: ecdbbbda am: dc4bd8ba am: 590d67c5...

Merge changes Ie68aed2f,Ic40696b3 am: ecdbbbda am: dc4bd8ba am: 590d67c5 am: a3d74369 am: 4eed3ce1

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



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