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

Change-Id: I92583a321b315a29863f3a4312c537c4b688c74c