move the fields in RouteSelectionDescriptorParams to RouteSelectionDescriptor

Bug: 178075054
Test: full build pass
Change-Id: I283514bd63cb3ae7c37d8e3d4740e38f7e79a09e
Merged-In: I283514bd63cb3ae7c37d8e3d4740e38f7e79a09e
2 files changed