am bf140c36: Merge "Revert "Update TabLayout demo to use new APIs"" into lmp-mr1-ub-dev

* commit 'bf140c36ba8fb9ee798baa17064a30f6ba7fc4f8':
  Revert "Update TabLayout demo to use new APIs"