[automerge] add oriole and raven to COMMON_LUNCH_CHOICES 2p: 25d0ee4273

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

Bug: 222382030
Change-Id: I71224e03727bd1040fd9d3f03672b524e8676696