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

Change-Id: I0dc4ccb7eebbff28dbe1765a4cebd8c1daf2566a