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

* commit 'f655a80cbe55d5d49cf128821a0e5d283b1daede':
  Update TabLayout demo to use new APIs