[automerger skipped] Merge Android 12 am: 0ebf3c13bf -s ours

am skip reason: Merged-In Iea25ab2acc22bf7e8dea6afeb5b26df04502e956 with SHA-1 f459a64379 is already in history

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

Change-Id: Idbaec8a49cae4b7568264d96ac550d284cc7df60
tree: 08b53652857dee6697fc8de5862737052c12d33d
  1. vrcore/
  2. METADATA