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
am: 063ce4d3fd  -s ours

Change-Id: I35d0cf8dba8d0b7c04aac48d1680b6c589a24156