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

Change-Id: If9e221b6961aa6f1c023d4c59f7b30ea028944fd