Merge 6024c676cd8eada94651fea4e175923c152c7d07 on remote branch

Change-Id: Iccba943983243e297dc95632aaf57254164f79bd
diff --git a/etc/init.qcom.usb.rc b/etc/init.qcom.usb.rc
index 012c6db..0f4cb0c 100644
--- a/etc/init.qcom.usb.rc
+++ b/etc/init.qcom.usb.rc
@@ -1923,3 +1923,8 @@
     symlink /config/usb_gadget/g1/functions/uvc.0/streaming/header/h1 /config/usb_gadget/g1/functions/uvc.0/streaming/class/fs/h1
     symlink /config/usb_gadget/g1/functions/uvc.0/streaming/header/h1 /config/usb_gadget/g1/functions/uvc.0/streaming/class/hs/h1
     symlink /config/usb_gadget/g1/functions/uvc.0/streaming/header/h /config/usb_gadget/g1/functions/uvc.0/streaming/class/ss/h
+
+on property:vendor.usb.uac2.function.init=1
+	chown system system  config/usb_gadget/g1/functions/uac2.0/c_status
+	chown system system  config/usb_gadget/g1/functions/uac2.0/p_status
+	write config/usb_gadget/g1/functions/uac2.0/c_sync adaptive
diff --git a/etc/init.qcom.usb.sh b/etc/init.qcom.usb.sh
index 1ca60ea..451296f 100644
--- a/etc/init.qcom.usb.sh
+++ b/etc/init.qcom.usb.sh
@@ -188,3 +188,7 @@
 if [ -d /config/usb_gadget/g1/functions/uvc.0 ]; then
 	setprop vendor.usb.uvc.function.init 1
 fi
+
+if [ -d /config/usb_gadget/g1/functions/uac2.0 ]; then
+	setprop vendor.usb.uac2.function.init 1
+fi