Merge "To support loading display_settings.xml on treblized builds, include...

Merge "To support loading display_settings.xml on treblized builds, include the product directory on the search path for the file. If not found, fallback to the vendor directory." into sc-v2-dev