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

Change-Id: Ic8286aa7b00510fa0cbedeb1e82fc72eb8576718