[automerger skipped] Merge "Update docs and ensure PHONE_STATE is more predictable for unknown numbers." am: ce7e53a943 am: 7037431901
am: 7bc7929611  -s ours

Change-Id: I9c4b74002776d7e96ac7cef1db6feffda2abd677