Merge "Freeze HALs for Android Q" am: 3c27166505
am: b540a82ce4

Change-Id: Ib2f391e1f5e87bc47bca49900d45f40cd23af4f4