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

Change-Id: I0209045722149a6f2ad074d3aac395122ef1c1a8