Merge changes from topic "am-8fbea212b3ac45f7b07637ea51b9d605" 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:31c96f00e1-s ours am:7bf8adb31e-s ours am:956623c6c0-s ours [automerger skipped] Add userId check before loading icon in Device Controls am:2be24a7804-s ours am:c1b0b217a9-s ours am:6618831d0d-s ours am:99bdfb081f-s ours am:e988d34132-s ours
This commit is contained in:
committed by
Android (Google) Code Review
commit
be4a8af53e