Merge changes from topic "am-679a49558c5e439fb6c9bba46b37efaf" 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 rvc-qpr-dev am: fb5f9cb9 -s ours am: a5201399 -s ours am: 6f3486c3 -s ours am: 67c47b1a -s ours am: c3a2bae4 -s ours am: 55d6ce33 -s ours
  [automerger skipped] DO NOT MERGE am: 5c3d1dce -s ours am: 8499a1e3 -s ours am: 6666fd9e -s ours am: f5d96cc0 -s ours am: 7d7f57e6 -s ours am: 5ded2d5a -s ours