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