Merge "Fix launching bubbles from widgets" into sc-dev am: faee2e6b am: 116a6e04

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14940550

Change-Id: I19fe960e792ae5c2f05a582ce93e246ba275b8c9