Merge "Only ask for credentials in add account if user is locked." into nyc-dev am: 832c8e4fda
am: 0eab365289
* commit '0eab3652891460e3c4ce3582a14f682e5759fb55':
Change-Id: I84b70273827460caf65d04759eb06cf624579f1c
This commit is contained in: