[automerger skipped] Merge Android R am: b85105e946 -s ours am: fafa1b08dc -s ours am: 009ea695e2 -s ours am: ef96f113d8 -s ours am: 50d9c7d656 -s ours

am skip reason: Change-Id I25f0ca04f2e967f35d377e923f73486b95dd47e3 with SHA-1 85259cdc08 is in history

Original change: https://android-review.googlesource.com/c/device/google/vrservices/+/1422309

Change-Id: I587ef020108cd80f0f10df13d2eaa3187bf1a599
tree: 5ed3af68a775de5d768d0a464723d95360379fa3
  1. vrcore/
  2. xr/
  3. METADATA