Merge "Cleaned up the flag support_phone_uid_check_for_multiuser" into main