Merge "Freeze HALs for Android Q (internal)"