trinket-common: Update display stack from LA.UM.9.11.r1-02100-NICOBAR.0

Change-Id: Ib42e5a10254efc5f639d979c3995133587b532ae

Android.bp

@@ -206,17 +206,6 @@ android_app_import {
 	product_specific: true,
 }
 
-android_app_import {
-	name: "colorservice",
-	owner: "xiaomi",
-	apk: "proprietary/product/app/colorservice/colorservice.apk",
-	certificate: "platform",
-	dex_preopt: {
-		enabled: false,
-	},
-	product_specific: true,
-}
-
 android_app_import {
 	name: "datastatusnotification",
 	owner: "xiaomi",
@@ -286,6 +275,17 @@ android_app_import {
 	product_specific: true,
 }
 
+android_app_import {
+	name: "colorservice",
+	owner: "xiaomi",
+	apk: "proprietary/system_ext/app/colorservice/colorservice.apk",
+	certificate: "platform",
+	dex_preopt: {
+		enabled: false,
+	},
+	system_ext_specific: true,
+}
+
 android_app_import {
 	name: "WfdService",
 	owner: "xiaomi",
@@ -307,7 +307,8 @@ dex_import {
 dex_import {
 	name: "com.qti.snapdragon.sdk.display",
 	owner: "xiaomi",
-	jars: ["proprietary/framework/com.qti.snapdragon.sdk.display.jar"],
+	jars: ["proprietary/product/framework/com.qti.snapdragon.sdk.display.jar"],
+	product_specific: true,
 }
 
 dex_import {

proprietary/etc/permissions/com.qti.snapdragon.sdk.display.xml → proprietary/product/etc/permissions/com.qti.snapdragon.sdk.display.xml

 <?xml version="1.0" encoding="utf-8"?>
 <!--
  /* ====================================================================
- * Copyright (c) 2014 Qualcomm Technologies, Inc.
+ * Copyright (c) 2014,2020 Qualcomm Technologies, Inc.
  * All Rights Reserved.
  * Confidential and Proprietary - Qualcomm Technologies, Inc.
  * =====================================================================
@@ -13,6 +13,6 @@
 
     <library
         name="com.qti.snapdragon.sdk.display"
-        file="/system/framework/com.qti.snapdragon.sdk.display.jar" />
+        file="/product/framework/com.qti.snapdragon.sdk.display.jar" />
 
 </permissions>