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

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

Change-Id: I9422403b654dd2e33842be93097703d56da00f1a