Merge changes from topic "am-34c55ad1658d448aab568b7aecf72ae0" into tm-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Merge "DO NOT MERGE Move accountname and typeName length check from Account.java to AccountManagerService." into rvc-dev am: ea3ccf17 -s ours am: 83ef3b97 -s ours am: 581958c3 -s ours am: d40134d1 -s ours am: a7b4a806 -s ours am: dff44e41 -s ours am: d4ed04ca -s ours am: 75e80df4 -s ours
  [automerger skipped] DO NOT MERGE am: aa58f990 -s ours am: 17acc1cf -s ours am: 1db76abd -s ours am: 19976cb6 -s ours am: fd21bc37 -s ours am: fe7dec7f -s ours am: 3dd89f72 -s ours am: 9ffb7a54 -s ours