Merge changes from topic "am-db90d31b263c4634abaa665ae875b8f1" 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: 12b10f77 -s ours am: ed619842 -s ours am: caaa6004 -s ours am: 33dc7e22 -s ours
  [automerger skipped] DO NOT MERGE am: aa58f990 -s ours am: 17acc1cf -s ours am: 1db76abd -s ours am: 2cabafa6 -s ours am: 779ca928 -s ours am: c1159055 -s ours am: 4db23c54 -s ours