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

Change-Id: Ie95ca4b6f80aa3c49ad4280217529d4cd56ebb49