Merge "Starting sandbox activity should not start a new sandbox process" into...

Merge "Starting sandbox activity should not start a new sandbox process" into udc-dev am: 94a4ffa3 am: e6bf7b8b am: e21dd6f1

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



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