Merge "Add android_sdk to the list of DeviceConfig scopes that are mapped to system properties." into main