Merge "Move UserManagerInternal out of android.os"