Merge changes Ib90ae553,I3ca3ad9c am: e74976cc am: f9bfa851 am: 16da4b38...

Merge changes Ib90ae553,I3ca3ad9c am: e74976cc am: f9bfa851 am: 16da4b38 am: a3863295 am: 14afc14c

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



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