Merge changes Ie5426ff3,I04beb9e0,If90e8d1a am: 447aa1af am: 7e53a2df am:...

Merge changes Ie5426ff3,I04beb9e0,If90e8d1a am: 447aa1af am: 7e53a2df am: dce0b1e6 am: f84b72a7 am: bebea073

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



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