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

Change-Id: Iab491666a4a2d0bcc8b8f360bd3f102c1aca7c27