Merge "Do not override user set app op permission state when handling installer permission change. " into udc-dev