Merge "Re-introduce ActivityTaskManager in CdmService" into tm-dev am:...

Merge "Re-introduce ActivityTaskManager in CdmService" into tm-dev am: 06258e35 am: dfda3dad am: fc5fde5d

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



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