[automerger skipped] Merge "Freeze HALs for Android S" am: 2668e4bc46 am: 7cfbe2e8df am: a8fd491c79 -s ours

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

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

Change-Id: Iba253b7ab24c5b1919be7ed61c5cfb2cc8fd0220