Merge "Keep PRODUCT_FULL_TREBLE to true even when some requirements are not met" am: 8a89848373
am: ad9feb4cac

Change-Id: I54af75ed4397752cf8b8a9996a2d38d7d5be6f84