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

Change-Id: I4a8e07b44aa920b252de468fa91d3a49fa7b9eeb