Merge "wear_ui: Remove kMaxCols/kMaxRows/visible_text_rows/menu_headers_." am: e9605b8ca0
am: d92baf5988

Change-Id: Id98f998569e0e07296d69030c3d555cd32203e70