[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE am: eca126d0c4 -s ours am: 5bb3a07730 -s ours am: ee5620c2ea -s ours

am skip reason: Change-Id I2e0b4cf7537047d70366c4a906a4e05d39744942 with SHA-1 399c318e8e is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/pixel/+/12579466

Change-Id: I460e577273a09cb22d061c20c5709317e69b833f