Merge "Add activity option flag for background starts for bubbles" into...

Merge "Add activity option flag for background starts for bubbles" into udc-dev am: 0dcaf197 am: 00285ff0

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



Change-Id: I04475647c786f99193313400cf9a2f2195fe65cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>