Merge "Add empty abstract method to BaseIDevicePolicyManager"