Merge "Convert Activity and WindowManager Tests to Device Side"