Merge "Add policy identifier for device policy API" into main