Merge changes Ie68aed2f,Ic40696b3 am: ecdbbbda82

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

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