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

am skip reason: subject contains skip directive

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

Change-Id: Ie48cb761d6e2aad1e08ad6a8661580a4ae585f2a