Merge "Freeze HALs for Android R" into rvc-dev am: 571e88eb77 am: 865c3071ca

Change-Id: Iab334e24249634067fafd4705039420e9918cad0