Merge changes from topic "am-a1da993bd7544cd081defbb23810abf0"

* changes:
  [automerger skipped] Merge changes from topic "am-b83cd143842c4a40a3f0d1e7713f0869" into tm-d1-dev-plus-aosp am: f7a7f544 -s ours am: 158d2035 -s ours
  [automerger skipped] Merge "DO NOT MERGE Move accountname and typeName length check from Account.java to AccountManagerService." into sc-v2-dev am: 98c58054 -s ours am: e1be97bf -s ours am: 32072c71 -s ours am: 4ce54dff -s ours am: 0fced0e4 -s ours