Merge "DeviceConfig: Split android:window_manager into android and window_manager"