Fix some TabBarTheme mergeOs (#22285)
Fix some TabBarTheme mergeOs (#22285)


tvolkert/flutter,Hixie/flutter,cbracken/flutter,tvolkert/flutter,Hixie/flutter,Hixie/flutter,cbracken/flutter,Hixie/flutter,flutter/flutter,flutter/flutter,cbracken/flutter,tvolkert/flutter,cbracken/flutter,tvolkert/flutter,flutter/flutter,flutter/flutter,Hixie/flutter,cbracken/flutter,flutter/flutter,tvolkert/flutter,tvolkert/flutter,tvolkert/flutter,cbracken/flutter,Hixie/flutter,tvolkert/flutter,Hixie/flutter,tvolkert/flutter,tvolkert/flutter,flutter/flutter,Hixie/flutter,flutter/flutter,Hixie/flutter,cbracken/flutter,cbracken/flutter,flutter/flutter,flutter/flutter,Hixie/flutter,cbracken/flutter,flutter/flutter,cbracken/flutter