Merge "b/5399355 StringIndexOutOfBoundsException from AccountManagerService"