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 am: 121d04b6

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



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