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

Change-Id: I43610061fbb057d08cadd85542a61a4fefe66adf