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

Change-Id: I8638e4cb07fb3912b8d783b72d236d31d9160173