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

Change-Id: I0588588f51ab44b198357ca90bf676c206c8210c