Merge "Freeze HALs for Android S" am: 2668e4bc46 am: 7cfbe2e8df

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

Change-Id: I12ef3d9b606644618592d4267c71dd81c484ec30