[automerger skipped] Merge "Remove VrFlinger usages from SF." into...

[automerger skipped] Merge "Remove VrFlinger usages from SF." into rvc-qpr-dev-plus-aosp am: bcb0a21f -s ours

am skip reason: Change-Id I5b74c77005474bd9f6dbce589697472738416d41 with SHA-1 9c58bcd9 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/13327309

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9e52003de291080ba87b088158f203aecb480b33