Merge "Enable enable_new_privacy_dialog For Droidfood" into main