Merge "Update on a few DevicePolicyManager APIs for affiliated PO"