Merge "packages/providers/MediaProvider: Set LOCAL_SDK_VERSION where possible."
am: b8a3eff2e5

Change-Id: I1028038edf61c0be9d5665a6706d5e43b9b42f13