Merge \\"Fix TabLayout setSelection() issues with custom views DO NOT MERGE ANYWHERE\\" into nyc-dev am: e5ff5afd3c  -s ours
am: c8fe6ce368  -s ours

Change-Id: I38134d96bc3146d01669464e31a9913b1eb763fe