Merge changes from topic "am-e1391362c40241b5824d490b89ad654c" into tm-qpr-dev

* changes:
  [automerger skipped] Merge "enforce stricter rules when registering phoneAccounts" into tm-dev am: 84d903652d -s ours am: d2cb926d84 -s ours
  [automerger skipped] enforce stricter rules when registering phoneAccounts am: b07326f1fb -s ours am: b74137449f -s ours