am cf393faa: Merge "resolved conflicts for merge of c1c45a4d to...
am cf393faa: Merge "resolved conflicts for merge of c1c45a4d to gingerbread-plus-aosp" into gingerbread-plus-aosp
* commit 'cf393faa':
- Move the business rule management down to DRM agents. - Do not register DRM sniffer because drmserver is not enabled.