Merge "Remove use of PRODUCT_FULL_TREBLE from sensors." am: 49cf861945
am: 798c73b818

Change-Id: I86620d1ecbd138444f20eb9ba96d56e82b525c0a