Merge "Remove testAtSignInUserInfo and add testMultipleUserField" into nougat-cts-dev
am: b13f7506e4

Change-Id: If4533c30446f0d9da5ce4ecd0188f9441c4b57db