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

Change-Id: I4be1e60b11b8df26ea8d13e39d125ac461bfc037