[automerger skipped] Merge "Implement DrmSessionManager w mediaresourcemanager" am: 801a252a42 am: 620f87d9a4 am: 77b8c802db -s ours
am skip reason: Change-Id Iab9f4f681c83f46b043cefc8633bb3e513a8e75a with SHA-1 c3af31b8f1 is in history

Change-Id: Id49f891087f88a97fbcbfdc3752832fb44eb4780