Merge "Deprecate SoftInputWindowProto.{name,window_type,gravity,takes_focus}"