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

Merge "Merge "Starting sandbox activity should not start a new sandbox process" into udc-dev am: 94a4ffa3 am: e6bf7b8b am: e292f80b" into udc-qpr-dev-plus-aosp am: 3ec5507a

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



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