Reconcile mediadrm stuff with cm... explicit permission setting didn't fix play movies

Change-Id: I32f82488d59e328e43703f79118ec3156d452695