[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT...

[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 691a80ca am: de31e168 -s ours am: 8d2df7ca -s ours

am skip reason: Change-Id Ib2a6c8b5cc127d4aab61a454f47f3cce410d674e with SHA-1 01006155 is in history

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

Change-Id: Ic16044870255320fa8a70b97c16d686efe2f8750