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