Merge "Revert "Revert "Changed dpm shell commands to use 'cmd device_policy'""" into sc-dev