Merge "Replace use of java.util.HashMap with android.util.ArrayMap in UserManagerCompatVL class" into ub-launcher3-dorval-polish
am: 21e69dc142

Change-Id: Ic3425a8a125a453dd7834fe7e18042aa3621f69e