[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 7a7e6e5ace am: 700ea48cb9 -s ours

am skip reason: Change-Id I115103a3400648975f1ec13f1616cc05ef205679 with SHA-1 a1fade51b7 is in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1429921

Change-Id: I4eaeeb21000083f14aac4b750b12bc8c13b388eb