Merge "Use mock window manager for BubbleController in tests" into rvc-dev am: f7f3ba1568 am: 79960652ac

Change-Id: Ic473ed3cf0ba55f4118da0d9e4910007de2ae2b9