am ffa7f10b: am 9942c628: Merge "Fix layout state setup for predictive layouts" into lmp-mr1-supportlib-release

* commit 'ffa7f10bb77df897ddd19b272e26951ec117f715':
  Fix layout state setup for predictive layouts