Merge changes I8b5e08a3,Iccfe06f9 am: 5653687caf

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

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