Merge "packages/providers/TelephonyProvider: Set LOCAL_SDK_VERSION where possible."
am: b0cfd52c4d

Change-Id: I89267c5943cad6dfba82bfb7522ba2e4a4164429