Merge changes from topic "am-06ea116367e346e2be5e0ca286038d46" 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: b83e8e93 -s ours am: db714ccf -s ours am: 010a3815 -s ours
  [automerger skipped] DO NOT MERGE am: 5c3d1dce -s ours am: 8499a1e3 -s ours am: 9d33be49 -s ours am: b9448df2 -s ours am: 20983bf5 -s ours