Merge "Add ACTIVITY_SECURITY_OWNERS to ActivityManager* and ActivityStartController.java" into main am: 21c807297a

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

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