Merge changes from topic "fix_set_security_level"

* changes:
  Fix build error in topic fix_set_security_level
  Revert "Revert "Update drm hal to find drm@1.1 factories""
  Revert "Revert "Fix MediaDrm security level APIs""