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

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

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