[automerger skipped] Merge "move the fields in RouteSelectionDescriptorParams...

[automerger skipped] Merge "move the fields in RouteSelectionDescriptorParams to RouteSelectionDescriptor" am: 929ac903 -s ours am: 7d2baf1d -s ours am: 61f82f52 -s ours am: 1f95133f -s ours am: afb72f02 -s ours

am skip reason: Merged-In I283514bd63cb3ae7c37d8e3d4740e38f7e79a09e with SHA-1 f78f2676 is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1628999

Change-Id: Ifa9b814b7a13ce5b4d1f6d98b3a47866507ad335