Merge "Merge "Collapsing the heads up when showing the bouncer" into qt-r1-dev...
Merge "Merge "Collapsing the heads up when showing the bouncer" into qt-r1-dev am: 628a0ae6 am: d2169071" into qt-qpr1-dev-plus-aosp
am: e70c5e70
Change-Id: Iad3115e7077e00f7b055d066881898cc1a31e0fc