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

Change-Id: I6e9f57cf1841b03b33c60eebde98b9eda6c474ab