[automerger skipped] freeze compat matrix 6 for Android S am: be6a797247 am: 7c26b15e75 -s ours

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

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

Change-Id: I2775258f3b897c397cf09e4a0f5ff3e8302aaf47