[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 34ecedbc am: cf105b5e -s ours am: 786dc747 -s ours am: eb3fb0ec -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: I72cbb1bf852e620bb1df14a8e83908899f29d995