am f33326d4: Merge "Cts fix: popup window laying out in the chin." into lollipop-mr1-cts-dev

* commit 'f33326d4260d7f01c683805f3c685df5696dc50b':
  Cts fix: popup window laying out in the chin.