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