Merge "Preserve flags for non-runtime permissions upon package update." into udc-dev