Merge "Fix information disclosure in mediadrmserver" into oc-dev
am: f452267ae8

Change-Id: I96ab0c115e78c10930a9bd12837b422f8cd8bce5