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

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



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