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

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



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