Merge "Clarify doc comment for setUnlockedDeviceRequired"