Merge "Remove flagging from existing Device Policy APIs" into main