Merge "Use 'inherit-product/inherit-product-if-exists to include config files"...

Merge "Use 'inherit-product/inherit-product-if-exists to include config files" am: 3ccf730c am: d6b56ebb am: 9be500f3 am: e4fa02b3

Original change: https://android-review.googlesource.com/c/platform/build/+/1493738

Change-Id: Ie3f7346acb9603db4ded6f4bc757c12f18414684