Merge "CredManUI: Use origin to replace the calling app package name." into udc-dev