am f20cae6b: am 4ed61b22: Merge "Move virtual displays out of HWC 1.2, mark experimental" into jb-mr2-dev

* commit 'f20cae6b94b7714e76b284f4167bb238e3aee2d2':
  Move virtual displays out of HWC 1.2, mark experimental