Merge changes from topic "am-e3d7420e56534d7081c701f1fd958308" am: 0bafc6ab71 am: a34f5602c8 am: 2e9b830d1a

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

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