Put drm service and manifest fragments back

Bug: 205154779
Test: presubmit
Signed-off-by: Roman Kiryanov <rkir@google.com>
Change-Id: Id317827fd259232e0082f95fc691f94c08f7efc8
6 files changed