Merge "Add AppOps listening to STService" into udc-dev