Merge changes from topic "am-e3d7420e56534d7081c701f1fd958308" am: 0bafc6ab...

Merge changes from topic "am-e3d7420e56534d7081c701f1fd958308" am: 0bafc6ab am: a34f5602 am: 2e9b830d am: 183fcac6

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



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