Android O IOT Preview 7 (4635859)
Merge "packages/providers/MediaProvider: Set LOCAL_SDK_VERSION where possible."