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

Change-Id: Iebf22867079dea39513769c90cd618cf92336965