Merge tag 'android-7.0.0_r6' of...

Merge tag 'android-7.0.0_r6' of https://android.googlesource.com/platform/frameworks/opt/telephony into HEAD

Android 7.0.0 release 6

# gpg: Signature made Thu 08 Sep 2016 04:42:53 PM PDT using DSA key ID 9AB10E78
# gpg: Can't check signature: public key not found