Merge "Add a custom tabs API to use RemoteViews in the secondary toolbar am: f75fe23543 am: b4d249724c" into nyc-mr1-dev-plus-aosp