Merge "packages/services/Telephony: Set LOCAL_SDK_VERSION where possible." am: 58dacb4ced am: c162b6066b
am: 8ca4026e23

Change-Id: I6358c55d5abcb5cc69316979b14513b20ef5f6e2