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

Change-Id: I8ee844b6ddfd2705aa9d86f2d1e7ea8d7fad333a