Merge "Merge "Remove testAtSignInUserInfo and add testMultipleUserField" into nougat-cts-dev am: b13f7506" into nougat-mr1-cts-dev am: 64a03e1c Change-Id: Idca909543076b1ad58f14be8df616fb622be3c80