DO NOT MERGE - Merge RP1A.201005.006 am: 7fd5f8d2bc

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

Change-Id: If6136de7e90083c318bf1ebb0e24172dbfeacb16