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 am: 1dd864bc am: 601ccbfb

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15740824

Change-Id: I2eca81d2f0fba4326b423a37d033612cdaa4c6fc