Merge changes from topic "am-b0c2c9886d5349caa5ba9c438729bc00" into tm-d1-dev-plus-aosp

* changes:
  [automerger skipped] Merge "DO NOT MERGE Move accountname and typeName length check from Account.java to AccountManagerService." into sc-dev am: 62c968ff am: 5e52ac4e -s ours am: 8602c471 -s ours am: 5cffe3f5 -s ours am: 8b0c7572 -s ours
  [automerger skipped] DO NOT MERGE am: c48f5407 -s ours am: 01d3fa31 -s ours am: 698d23d3 -s ours am: 8c7eed1b -s ours am: 631f7517 -s ours