Merge "packages/providers/TelephonyProvider: Set LOCAL_SDK_VERSION where possible." am: b0cfd52c4d am: 03b92e1fb4
am: 003f7700c4

Change-Id: Ibee2315f3db7a0d64969fac1e5766e873b481c87