Merge "Remove usage of android.os.Build.IS_USER"