[automerger skipped] Merge "move the fields in RouteSelectionDescriptorParams to RouteSelectionDescriptor" am: 929ac903 -s ours am: 7d2baf1d -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: Ie92b33b4537b79eec2fefb5038f6fc05eb7bbebb