Merge "Merge "Support setting primary provider" into udc-dev am: d07c89db48 am: 23c6f5e306 am: 99cd0f36db" into udc-qpr-dev-plus-aosp