Merge "Implement DrmSessionManager w mediaresourcemanager" am: 801a252a42 am: 620f87d9a4

Change-Id: I2b551f9b161345ed05a7addb97166403f83cdd5e