Merge "Merge "Add userId check before loading icon in Device Controls" into udc-dev am: d0f6b9ac am: 27ca2217 am: 0b02edde" into udc-qpr-dev-plus-aosp