Merge "Updating CPP ActivityManager interface to be one way" into udc-dev am: e1f24a0902 am: 3a23d9151d am: 5c52527031

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

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