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

* commit '5c711f419ef3aa61e47bdae824aab3dcb68c85f3':

Change-Id: I062a4a6b1e18346016eb575ec609fecfdede5124