[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 754a1b5aed am: fe5fd5037d -s ours

am skip reason: Change-Id I08f9f187e356cddce687a9bfd368835bc3204c16 with SHA-1 5bb3a07730 is in history

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

Change-Id: Idbb7a2f456e4a92c43642c0ad0fbe4cdb303e607