Merge "Add flag android.multiuser.upgrade_user_summary_behaviour to trunk_staging." into main