Merge changes I57c4aacc,I8430579f am: 5060516c6f

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I435c30c7a156f0102637bf99266b7c59e31b129d