Merge "RouteDiscoveryPreference: Filter out null/empty values" into rvc-dev am: dbbb846b8c am: 9f35679ff8 am: 0c2d6be7f0

Change-Id: I227a33c59251db2c5059da5e228b5c6d331b0e12