Merge tag 'android-7.1.0_r7' of...

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

Android 7.1.0 release 7

# gpg: Signature made Fri 04 Nov 2016 11:14:08 AM PDT
# gpg:                using DSA key E8AD3F819AB10E78
# gpg: Can't check signature: No public key