Merge "Merge "Prevent uncommitted activity visibilities" into udc-dev am:...

Merge "Merge "Prevent uncommitted activity visibilities" into udc-dev am: d7fd5e78 am: fcd88057" into udc-d1-dev-plus-aosp am: e903e403

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



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