[automerger skipped] freeze compat matrix 6 for Android S am: be6a7972 am:...

[automerger skipped] freeze compat matrix 6 for Android S am: be6a7972 am: 7c26b15e -s ours am: 40ee2fc3 -s ours

am skip reason: Merged-In Id83986fc5089eefc2292f0042753f739f4e01a44 with SHA-1 86a518cf is already in history

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

Change-Id: I628dc413a6522050ce5045715569f932d93d3def