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

Change-Id: Id62a0febe91a3765d63ff9da1944bcbc993aac9e