Merge "Re-introduce ActivityTaskManager in CdmService" into tm-dev am: 06258e35ce am: dfda3dad5c am: e2d8e7c7f4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19066676 Change-Id: I0c44b22a5e50019e5dace4fa709c101d444c3be8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: