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

Change-Id: Id78a070a7ce2c4edffa7fe2e95ac7e6017812b8b