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

Change-Id: Ia718423b974bf82768890a5f7f8cab88280195fc