[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - DO...

[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE am: 6565677a -s ours am: 57a8c390 -s ours

am skip reason: Change-Id I92ad7146ad926a1c9a76461bf4bda38bfbf6b0c8 with SHA-1 34813f53 is in history

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

Change-Id: I4d660e9366e11885d4864b07ca3c7d07779c55fe