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

Change-Id: If287d77cb7e2bf894c2096b8b31c14a41cc41817