Merge changes from topic "am-98d2611d93db4ee1a8bd296e4f2dd9ac" into udc-d1-dev-plus-aosp
* changes: [automerger skipped] Merge "Add userId check before loading icon in Device Controls" into sc-v2-dev am:fee30bd247-s ours am:16f950f41f-s ours am:6394c42623-s ours am:72b88be502-s ours am:1e2468f4d6-s ours am:178a958149-s ours [automerger skipped] Add userId check before loading icon in Device Controls am:2be24a7804-s ours am:c1b0b217a9-s ours am:78f6c79a1b-s ours am:029e25a34b-s ours am:79421b7608-s ours am:f18932028b-s ours
This commit is contained in:
committed by
Android (Google) Code Review
commit
c4d6c6e69e