Merge "Remove VrFlinger usages from SF." into rvc-qpr-dev-plus-aosp