Merge "[automerger skipped] Merge "enforce stricter rules when registering...

Merge "[automerger skipped] Merge "enforce stricter rules when registering phoneAccounts" into rvc-dev am: 7e58d882 am: 53a66d76 -s ours am: 064418ad -s ours am: 46a30d4f -s ours am: 6fce1f1b -s ours am: db44648d -s ours am: 320b5781 -s ours" into udc-dev