Merge "Change android.permission.RESTRICTED_VR_ACCESS to SystemAPI" into oc-dev am: 1c9e549c00
am: a70ba223b3

Change-Id: Ib0d10d38e7454cc4ee94b9195d81b6a49a56b94a