[automerger skipped] Merge "Freeze HALs for Android S" am: 2668e4bc am: 7cfbe2e8 am: a8fd491c -s ours am: 4f0ad933 -s ours

am skip reason: Merged-In I77ee02664242827d9aa96c985764cfc109c52b84 with SHA-1 88027aa3 is already in history

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

Change-Id: If001727afe85918f54508f85c5f6d794318ae995