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: b50de56d

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



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