Merge "[automerger skipped] Merge "Add userId check before loading icon in Device Controls" into tm-dev am: cdd1be4645 am: c8884c55e9 -s ours am: 91262ffdcb -s ours am: ce126ccdfe -s ours" into udc-d1-dev-plus-aosp