[automerger skipped] Merge "Remove VrFlinger usages from SF." am: 63e04c852d am: 99204942b3 -s ours

am skip reason: Change-Id I5b74c77005474bd9f6dbce589697472738416d41 with SHA-1 64f03f516c is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2d1079543f01e698997e20ef47461f594c5d7421