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

Change-Id: I83870e2f4d87cce1dd6e34922dd6921955f7cfa3