Merge "Add test for EnterpriseGuard to test against the newly added user setting am: a27f51a485 am: fb25155003" into nyc-mr1-dev-plus-aosp