Merge "Freeze HALs for Android R" into rvc-dev am: 571e88eb77 am: 182ecaa97b am: e5a0c7ef18

Change-Id: I70be92d499277fcca73182af1f79f345e4a21ecb