[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: f459a64379 -s ours am: f456cccf68 -s ours am: 4a6c25fea7 -s ours

am skip reason: Merged-In I29c9fbb6fa3ecf335a3334a4a7365f86ef013542 with SHA-1 67138ba629 is already in history

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

Change-Id: I4fa7cbb7e3b2be05437fb825baa64f708ad9f75c