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

Change-Id: I077fb0a3070f0c1d428933365f7caac16eb924fc