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

Change-Id: I8e5e76a1093c6774c5394575d227fc2c2174eb19