Merge "Update docs and ensure PHONE_STATE is more predictable for unknown numbers...

author Tyler Gunn <tgunn@google.com>

Thu, 21 Jun 2018 18:10:16 +0000 (18:10 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Thu, 21 Jun 2018 18:10:16 +0000 (18:10 +0000)
author Tyler Gunn <tgunn@google.com>
Thu, 21 Jun 2018 18:10:16 +0000 (18:10 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 21 Jun 2018 18:10:16 +0000 (18:10 +0000)
diff --cc telephony/java/android/telephony/TelephonyManager.java
Simple merge
author	Tyler Gunn <tgunn@google.com>
	Thu, 21 Jun 2018 18:10:16 +0000 (18:10 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 21 Jun 2018 18:10:16 +0000 (18:10 +0000)