Merge "Add userId check before loading icon in Device Controls" into udc-dev am: d0f6b9acee am: 27ca2217b5 am: fc613ec09d am: b5798c1035
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23891752 Change-Id: Ic97076199f192000dbc065463aac4b54cec746ba Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: