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: 02910364 am: a6e310a0 am: 400de1f7

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



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