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

Change-Id: I094e8ca25bab2dee1fa4cb959519af8d7568ce59